Adding more geometry stuff
Merging changes
More merging
Merge branch 'master' of https://github.com/MrPillBoxHat/CMSC425

Conflicts:
	Megaman CMSC451/Megaman CMSC451/Megaman CMSC451.vcxproj
	Megaman CMSC451/Megaman CMSC451/Megaman CMSC451.vcxproj.filters
	Megaman CMSC451/Megaman CMSC451/X.cpp