Collision fixes
refactored into gameStates
removed dead code
removed dead code
intro screen menu up and running
lucifer sprite now animating from basic state
lucifer sprites animated
Merge branch 'master' of https://github.com/eirikurorri/lucifer

Conflicts:
	README.md
	main.lua