Branch Test
branch commit
Merge remote-tracking branch 'origin/master' into branch_test

Conflicts:
	git_test/src/com/sarasu/git/test/GitTest.java