Awesome
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/MainPackage/GameWorld.java
Merge remote-tracking branch 'origin/master'
Awesome