Minor Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dan_Prototype/core/src/screens/GameScreen.java
Merged our changes