making me commit to synch

No major changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Grid.txt