feature_2 commit
Merge branch 'develop' of https://github.com/merphonos/study into feature/feature_2

Conflicts:
	HelloGit/src/main/java/Hello/HelloGit/App.java
Merge branch 'feature/feature_2' into develop