worked on some shiate
Merge branch 'master' into Riven

Conflicts:
	ClassProject/ClassProject.v11.suo
	ClassProject/ClassProject/ClassProject.csproj
	ClassProject/ClassProject/Controllers/InstructorController.cs
	ClassProject/ClassProject/bin/ClassProject.dll
	ClassProject/ClassProject/bin/FCTDataModel.dll
	ClassProject/ClassProject/obj/Debug/ClassProject.csproj.FileListAbsolute.txt
	ClassProject/FCTDataTests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge branch 'master' into Riven

Conflicts:
	ClassProject/FCTDataTests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
CSS yada yada
Merge branch 'master' into Riven

Conflicts:
	ClassProject/ClassProject/Views/Textbook/Create.cshtml
	ClassProject/ClassProject/bin/ClassProject.dll
	ClassProject/ClassProject/bin/FCTDataModel.dll
	ClassProject/ClassProject/obj/Debug/ClassProject.csproj.FileListAbsolute.txt
	ClassProject/FCTDataTests/obj/Debug/FCTDataTests.csproj.FileListAbsolute.txt
Merge branch 'master' into Roger

Conflicts:
	ClassProject/ClassProject.v11.suo
	ClassProject/ClassProject/bin/ClassProject.pdb
	ClassProject/ClassProject/bin/FCTDataModel.pdb