vcxgcb
Merge branch 'master' of https://github.com/samsammy/GiBranch.git

Conflicts:
	GitTest3/src/com/sammy/Hello.java