Merge remote-tracking branch 'origin/master' into master

# Conflicts:
#	code/home

.idea/vcs.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

code/home

@@ -1,2 +1,2 @@
-hahahahahaha
+hahaha
 get from version control...