Substantial work on commands
Merge branch 'master' of https://github.com/jannickj/cruel-nemesis

Conflicts:
	XmasEngine