Updated grid and main to better reflect the desired classes and main for submission
Merge remote-tracking branch 'origin/master'

Conflicts:
	Source/main.cc
merged upstream