added correct key updates
Merge branch 'master' into Threading

Conflicts:
	src/edu/ucsc/cs112/hex/test/BoardTest.java