grid view done
Merge remote-tracking branch 'origin/master'

Conflicts:
	Final Project.v11.suo
	Final Project/bin/Final Project.dll
	Final Project/bin/Final Project.pdb
	Final Project/obj/Debug/Final Project.dll
	Final Project/obj/Debug/Final Project.pdb