Made some changes
Merge origin/master

Conflicts:
	src/models/Planet.java
Merge origin/master

Conflicts:
	src/models/Planet.java
Merge origin/master