cleaned up graphics some more and added a mainmenu state
broke it for a second. fixed!
Merge branch 'master' of https://github.com/rbellido/Project