lots of stuff
Merge branch 'master' of https://github.com/spatterson1551/GraphicsFinal

Conflicts:
	Program1/Geometry.h
	Program1/MyGLWidget.cpp
	Program1/MyGLWidget.h
	Program1/Program1.vcxproj
	Program1/Program1.vcxproj.filters
	Program1/SceneGraph.cpp
	Program1/box.h
	Program1/chair.h
	Program1/floor.h
	Program1/table.h