Working...
Merge branch 'master' of github.com:dkellycollins/Awe

Conflicts:
	Awe.sdf
	Awe.sln
	Debug/Engine.exe
	Debug/Engine.pdb
	Engine/Debug/CL.read.1.tlog
	Engine/Debug/CL.write.1.tlog
	Engine/Debug/D3D11App.obj
	Engine/Debug/D3D9App.obj
	Engine/Debug/DXUT.obj
	Engine/Debug/DXUTDevice11.obj
	Engine/Debug/DXUTDevice9.obj
	Engine/Debug/DXUTcamera.obj
	Engine/Debug/DXUTgui.obj
	Engine/Debug/DXUTmisc.obj
	Engine/Debug/DXUTres.obj
	Engine/Debug/DXUTsettingsdlg.obj
	Engine/Debug/Engine.lastbuildstate
	Engine/Debug/Engine.log
	Engine/Debug/Engine.vcxprojResolveAssemblyReference.cache
	Engine/Debug/SDKmesh.obj
	Engine/Debug/SDKmisc.obj
	Engine/Debug/cl.command.1.tlog
	Engine/Debug/link.command.1.tlog
	Engine/Debug/link.read.1.tlog
	Engine/Debug/link.write.1.tlog
	Engine/Debug/mt.command.1.tlog
	Engine/Debug/mt.read.1.tlog
	Engine/Debug/mt.write.1.tlog
	Engine/Debug/rc.command.1.tlog
	Engine/Debug/rc.read.1.tlog
	Engine/Debug/rc.write.1.tlog
	Engine/Debug/vc100.idb
	Engine/Debug/vc100.pdb
	Engine/Engine.vcxproj
	ipch/engine-3f3a0b6/engine-12cbdb42.ipch
	ipch/engine-4e324b33/engine-12cbdb42.ipch
	ipch/engine-806875b5/engine-12cbdb42.ipch
Pull data type into separate file.
Removed files that do not need to be under version control.
Further clean up.