Small bug fix for tests.
Merge branch 'master' of https://github.com/GSam/Cluedo

Conflicts:
	src/swen222/cluedo/tests/ClockTests.java
Merge branch 'master' of https://github.com/GSam/Cluedo
Cluecard sorter tests.