Assets and game screen

did something
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/ayrten/scrots/screens/GameScreen.java