Merge branch 'master' of https://github.com/Rrego6/space_traders
Merge branch 'sarah'
shipyard ui
added comments
Merge branch 'master' of https://github.com/Rrego6/space_traders
added weapon and shield