Merge branch 'develop' of github.com:m0ep/potjam5
made a state based game
Merge branch 'master' of github.com:m0ep/potjam5
Merge branch 'master' into develop