nan
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/grouplab/Checkers.java
Resolved conflicts and fixed Game