- 
-
-
-
- 
-
-
+
+
+
+
- 
- 
- 
-
+ Westeroscraft Launcher
+
+
+
+
+
+
+
-
-
-
-
+
-
-
-
+
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
- Email
- - -
-
- Password
- - -
-
-
-
-
-
- -
- -
- -
-
-
-
- Post title
- -Posted by: PERSON 23.4.17
- -Hello WesterosCraft Builders and Honored Guests! As you know, - progress on Kingslanding had stalled, but no longer -- we want to finish this big, beautiful, city in style and - are calling all builders to the capital! - There has been a lot of progress with Kingslanding planning and we are happy to... -- -
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/app/indexNEW.html b/app/indexNEW.html
new file mode 100755
index 0000000..19cd8eb
--- /dev/null
+++ b/app/indexNEW.html
@@ -0,0 +1,180 @@
+<<<<<<< HEAD
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Email
+ + +
+
+ Password
+ + +
+
+
+
+
+
+ +
+ +
+ +
+
+
+
+ Post title
+ +Posted by: PERSON 23.4.17
+ +Hello WesterosCraft Builders and Honored Guests! As you know, + progress on Kingslanding had stalled, but no longer -- we want to finish this big, beautiful, city in style and + are calling all builders to the capital! + There has been a lot of progress with Kingslanding planning and we are happy to... ++ +
+
+
+
+
+
+
+>>>>>>> refs/remotes/origin/master
+
+
+
+
+
+
+
+