updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	MVCProject/MVCProject.v12.suo
	MVCProject/MVCProject/bin/MVCProject.dll
	MVCProject/MVCProject/bin/MVCProject.pdb
	MVCProject/MVCProject/obj/Debug/MVCProject.dll
	MVCProject/MVCProject/obj/Debug/MVCProject.pdb
Merge branch 'master' of https://github.com/ISGroup9/MVCProject

Conflicts:
	MVCProject/MVCProject/bin/MVCProject.dll
	MVCProject/MVCProject/bin/MVCProject.pdb
	MVCProject/MVCProject/obj/Debug/MVCProject.dll
	MVCProject/MVCProject/obj/Debug/MVCProject.pdb