added another method to master
Merge remote-tracking branch 'origin/master' into creatingMethod

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