From 416a9d19ce6028b7df56f2ccf36018563700dc86 Mon Sep 17 00:00:00 2001
From: c0ldn1ght <81449663+NightwindDev@users.noreply.github.com>
Date: Thu, 23 Nov 2023 23:05:52 -0500
Subject: [PATCH] Update readme.md

---
 readme.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/readme.md b/readme.md
index f37b9f6..b9f2456 100644
--- a/readme.md
+++ b/readme.md
@@ -1,4 +1,54 @@
 # How Do You Create a Tweak?
 Starting out can certainly be a challenge, but if you put your mind to it, you'll be able to grasp the concepts. This tutorial tries to be as comprehensive as possible to explain how tweaks are made.
 
+<<<<<<< HEAD
 You can view the guide [here](https://nightwinddev.github.io/Tweak-Tutorial/intro)
+=======
+Starting out can certainly be a challenge, but if you put your mind to it, you'll be able to grasp the concepts.
+This tutorial tries to be as comprehensive as possible to explain how tweaks are made.
+
+---
+
+### Requirements:
+
+- Basic [Object-Orientated Programming (OOP)](https://en.wikipedia.org/wiki/Object-oriented_programming) knowledge.
+- A text editor of your choice.
+- Either a [Theos](https://theos.dev) or [Dragon](https://dragon.cynder.me/en/latest/) installation.
+- Either a jailbroken device or the Xcode Simulator on macOS paired with [Simject](https://github.com/akemin-dayo/simject).
+
+---
+
+### Table of Contents:
+
+- [[ 0 ] Starting Off](./p0_starting_off.md)
+- [[ 1 ] Exploring Files](./p1_explore_files.md)
+- [[ 2 ] Syntax](./p2_syntax.md)
+- [[ 3 ] Views](./p3_views.md)
+- [[ 4 ] Headers](./p4_headers.md)
+- [[ 5 ] Preference Bundles](./p5_prefbundle.md)
+- [[ 6 ] Preference Bundles cont.](./p6_prefbundlept2.md)
+- [[ 7 ] Using `MSHookIvar`](./p7_mshookivar.md)
+- [[ 8 ] Avoiding `layoutSubviews`](./p8_noLayoutSubviews.md)
+- [[ 9 ] Utilizing `FLEX`](./p9_advanced_flex.md)
+- [[ 10 ] Rootless](./p10_rootless.md)
+- [[ 11 ] `%hookf`](./p11_hookf.md)
+- [[ 12 ] `%subclass` Wrapper](./p12_subclassWrapper.md)
+- [[ 13 ] Substrate Tweaks](./p13_substratetweaks.md)
+- [[ 14 ] Challenges](./p14_challenges.md)
+
+For any developers that want to contribute to this tutorial, feel free to do so!
+
+Just make a pull request with the changes that you want to add.
+
+---
+
+### Credits:
+- [@Luki120](https://github.com/Luki120) for helping out with some of the issues regarding Substrate + important & valuable contributions.
+
+---
+
+### Support:
+
+- [iOSJBN Discord Server](https://discord.gg/K3wGBBhPqp)
+- [r/jailbreakdevelopers](https://reddit.com/r/jailbreakdevelopers)
+>>>>>>> parent of d0085f6 (Add @L1ghtmann to credits)