prevent null Integers from being cast
reverse conditional order
mark turn as played after suggestion is made
force a conflict
Merge branch 'master' of github.com:chpatton013/clue

Conflicts:
	src/com/outtatech/client/ClientController.java
	src/com/outtatech/server/Game.java