Edited person 4
Merge branch 'Sydni'
Merge branch 'master' of https://github.com/RockLobsters/Space-Traders