closes #290 REALLY WANNA QUIT?
Merge branch 'master' of github.com:dbltnk/combat-prototype

Conflicts:
	main.lua