Made more quality changes
Merge origin/master
Merge origin/master

Conflicts:
	src/models/Planet.java