feature test
Merge branch 'develop' of https://github.com/merphonos/study into feature/new_feature

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