Add basic game features
Merge branch 'master' of github.com:Moe-/shootris

Conflicts:
	main.lua