Trying something more in Zepler
Merge branch 'master' of https://github.com/jmono/Test

Conflicts:
	MavenTest/src/main/java/com/mycompany/maventest/Main.java

test again, might be merging