diff --git a/index.html b/index.html
index b708882..83d13b0 100644
--- a/index.html
+++ b/index.html
@@ -11,4 +11,7 @@
 <script type="text/javascript" src="js/jquery-1.5.js"></script>
 <script type="text/javascript" src="js/wyrian.js"></script>
 </body>
-</html>
\ No newline at end of file
+</html>
+=======
+blbabnlazblk
+>>>>>>> 8c9ce0771b3b31e23fad325f9fbc388eeacf8e5d