v1.0: Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/Referee.java

v0.9

First attempt - possibly still buggy when wood 2 and up