test alternative branch
test alternative branch2
Merge remote-tracking branch 'origin/alternative'

Conflicts:
	src/Main.java
Merge branch 'master' of https://github.com/rusgit/testProject

Conflicts:
	src/Main.java