fix for UI
fix for UI
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/GamePanel.java
Merge remote-tracking branch 'origin/master'
fix for UI
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/GamePanel.java
Merge remote-tracking branch 'origin/master'
presentation
new push
currently changing GamePanel
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/GamePanel.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Player.java
Merge remote-tracking branch 'origin/master'
with error
Merge remote-tracking branch 'origin/master'