sw
Merge remote-tracking branch 'origin/master'

Conflicts:
	HelloGit/src/com/beauty/Main.java