sync
sync
sync issues
sync again...
sync
sync
kjhkhkjhkh
Merge branch 'heatherWorking' of https://github.com/joshbarnettlloydGSP420/SeniorProject into heatherWorking

Conflicts:
	dxframework/dxframework/DirectXFramework.cpp
	dxframework/dxframework/Enemy_Base.cpp
	dxframework/dxframework/Enemy_Base.h
	dxframework/dxframework/RenderObject.cpp