local
Merge branch 'master' of github.com:austinhulse/SpaceGame
fixed anthony's code for linux
travking moved files