Merge pull request #18 from garethleonard/master

Ship select and fixed merge conflicts
Two players working
Merge branch 'master' of https://github.com/klords/ser-215-asteroids