Did Person1
Did Person3.java
Merge remote-tracking branch 'origin/Jackie'
Merge branch 'Sydni'
Merge branch 'master' of https://github.com/RockLobsters/Space-Traders
Add p1 readme; delete p1 useless
Merge branch 'Jackie'
Merge branch 'master' of https://github.com/RockLobsters/Space-Traders
did person2
did person2
deleted useless made readme
Merge remote-tracking branch 'origin/kristen'
Merge branch 'Sydni'
Merge branch 'Sydni'
Merge branch 'master' of https://github.com/RockLobsters/Space-Traders
Merge branch 'master' of https://github.com/RockLobsters/Space-Traders
added readme.p3 and deleted useless.p3
Merge branch 'addison'
lowercase'd kristen's filename to match everyone else's
added username, not gtid#