Fixed random git writes to our files
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/grouplab/Checkers.java
Merge branch 'master' of https://github.com/atamis/flaming-cyril

Conflicts:
	src/grouplab/Checkers.java