Conflicts:
	GazEngine/GazEngine.vcproj
	GazEngine/gazengine/model/ModelFactory.cpp
	GazEngine/gazengine/model/ModelFactory.h
	GazEngine/gazengine/physics/Body.h
	GazEngine/gazengine/physics/SimpleBody.cpp
	GazEngine/gazengine/physics/SimpleBody.h

This is to correct for overwritten changes from the commits 'GrumpyBirds3D' and 'Physics Tutorial 004'