san...
Merge remote-tracking branch 'origin/master'

Conflicts:
	GITTest/src/com/gittest/GitTest.java