stuff
Merge branch 'master' of https://github.com/lsom/acornchase.git

Conflicts:
	acornchase/src/acornchase/ui/ScorePanel.java
Merge branch 'master' of https://github.com/lsom/acornchase.git