Honor stuff
Merge branch 'master' of https://github.com/petryjc/Ascension

Conflicts:
	Ascension/src/Game.java