Updating remote repository to 2/9/2013
f windows
Gotten better
Fixed to add all files
Figured out how to grab the chunks.
Added Stuff
PreFunction Switch
Dumb macbook Code.
Merge branch 'Assignment1' of https://github.com/Borzen/Awe into Assignment1

Conflicts:
	Awe.sdf
	Editor/MainForm.cs
Fixed to all
Final Push
Merge remote-tracking branch 'origin/Assignment1' into Assignment1

Conflicts:
	Awe.sdf
	Editor/Utilities/MinecraftChunkParser.cs
Updated for final push
Combined graphics controls into a single editor control, added GameManifest
Merge branch 'Assignment1'
Merge branch 'master' of https://github.com/zombiepaladin/Awe

Conflicts:
	Awe.sdf
	Debug/Engine.exe
	Debug/Engine.ilk
	Debug/Engine.pdb
	Editor/MainForm.cs
	Engine/Debug/CL.read.1.tlog
	Engine/Debug/CL.write.1.tlog
	Engine/Debug/D3D11App.obj
	Engine/Debug/DXUT.obj
	Engine/Debug/Engine.log
	Engine/Debug/link.read.1.tlog
	Engine/Debug/vc100.idb
	Engine/Debug/vc100.pdb
added orig file
Merge branch 'master' of https://github.com/Versaiteis/Awe

Conflicts:
	Awe.sdf
	Debug/Engine.exe
	Debug/Engine.ilk
	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/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/rc.command.1.tlog
	Engine/Debug/rc.read.1.tlog
	Engine/Debug/rc.write.1.tlog
	Engine/Debug/vc100.idb
	Engine/Debug/vc100.pdb
Added minecraft files