A lot of nitpicky changes :boom:
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/marine/world/entity/Entity.java