Updated draw method.

Still lots of bugs related to bullets.
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameScreen.java