updated conflicts

Author: NerdvanaNC

.gitignore

@@ -1,2 +1,2 @@
 *.pyc
-/__pycache__
+__pycache__

Scenes.py

@@ -121,7 +121,8 @@ def enter(self, hero):
     print("The ruby you pocketed starts glowing")
     print("This is where I'd describe the encouter with the boss")
     print("IF I HAD ONE!")
-    # Trying out Git
+    # Now I've changed some lines
+    print("And added this line in the login branch")