feature_1 end
feature_2 end
Merge branch 'develop' of https://github.com/merphonos/study into develop

Conflicts:
	HelloGit/src/main/java/Hello/HelloGit/App.java