Just added the menu button for texture mapping control.
Merge branch 'master' of github.com:dkellycollins/Awe into Texture_Mapping

Conflicts:
	Editor/MainForm.Designer.cs
I guess this has not been commited?
Added content folder to the ignore file.
Merge branch 'master' of github.com:zombiepaladin/Awe
Created subprojects for the engine.
Created classes for three inputs. Also create main class for audio project.
Created three different input classes. Filled in Mouse.cpp and Keyboard.cpp
Merge branch 'master' of github.com:zombiepaladin/Awe

Conflicts:
	.gitignore
Merge branch 'Texture_Mapping'
Merge branch 'master' of github.com:zombiepaladin/Awe

Conflicts:
	Editor/Controls/EditorViewerControl.cs
	Editor/MainForm.cs
Got editor working just fine.
Added in musicmanager code.
Updated to integrate PhysX and DirectX 11
Merge branch 'master' of ../vAwe into DemoCode