branch merge2
commit6 - branch merge
Merge remote-tracking branch 'origin/commit4.stash1' into commit4.stash1

Conflicts:
	GitDemo/src/main/java/com/czetsuya/git/demo/App.java