some test commit 2
Merge branch 'some-new-feature-2'

Conflicts:
	src/main/java/com/evelopers/mvc/HelloController.java
some test commit 2