Udpdate
Merge branch 'master' of https://github.com/Shadrongowes/3GC3-Final-Project

Conflicts:
	General3DPlane/Assignment3.cpp