This goes into the feature branch
Merge remote-tracking branch 'origin/feature'

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