Add game states.
Merge branch 'master' of https://github.com/Moe-/shootris

Conflicts:
	conf.lua
	main.lua