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