Same as nathans commit
Merge branch 'master' of github.com:team-checkers/checkers