Merge branch 'master' into Farkle

Conflicts:
	Games/bin/.gitignore
Merge branch 'Farkle' of https://github.com/BinEP/Games into Farkle