Enum for diff done and state for diff
Merge remote-tracking branch 'origin/master'

Conflicts:
	Game.cpp