my feature3
Merge branch 'feature3' into develop
Merge branch 'develop' of https://github.com/ilkinulas/GitSandbox into develop

Conflicts:
	Test.java