made my JUnit
Merge branch 'master' of https://github.com/gossipgirls/SpaceTraders2

Conflicts:
	src/models/Player.java