more end conditions
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/game/main.js