Merge branch 'Branch2'

Conflicts:
	practice_1/1.py

Author: arakann

practice_1/1.py

@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 """tyuui"""
+=======
+
+"""asd"""
+>>>>>>> refs/heads/Branch2
 name = raw_input("What's your name? > ")
-print("Hello, {}!".format(name))
+print("Hello, {}!".format(name))