basic controls
Merge branch 'master' of https://github.com/nallshouse/gamejam1