Merge pull request #1 from rWolstenholme/master

Merge change
Crappy movement.
Improved movement

Finished a robot sprite, he's a little on the cute side though (any
thoughts on the graphical direction of this game?  I like drawing things
but I don't think my stuff now is really what we want when it's done.
Merge pull request #2 from rWolstenholme/FPS

Merging all back to Master