initial commit
Merge branch 'master' of github.com:KonradHoeffner/xversusy

Conflicts:
	src/main/java/Main.java