short format
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/tekoalyhaaste/goodvsevil/GoodVersusEvil.java