did person2
deleted useless made readme
Merge remote-tracking branch 'origin/kristen'
Merge branch 'master' of https://github.com/RockLobsters/Space-Traders