Mostly working, movement needs some work
Merge branch 'master' of http://github.com/lvanderlyn/VideoGame