conflict 1
Merge remote-tracking branch 'origin/master'

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