Merge branch 'master' of https://github.com/rusgit/testProject

Conflicts:
	src/Main.java