reroll
fixed UI
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/GamePanel.java
final version