Rewrote the fight method in GameObject, fixed tests in GameObjectTest added comments.
Merge branch 'master' of https://github.com/danieka/indavaders

Conflicts:
	src/main/GameObject.java
	src/main/Planet.java