kristens super changes
Merge branch 'extra-credit' of https://github.com/RockLobsters/Space-Traders into extra-credit