worked on some shiate
Yep
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 Ian

Conflicts:
	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
Edited names on pages and corrected bug checking in books on instructer page
Minor CSS changes
Merge branch 'master' into ryan2
layout changes
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 ryan1

Conflicts:
	ClassProject/ClassProject/Content/Site.css
	ClassProject/ClassProject/Content/Site.less
	ClassProject/ClassProject/Content/Site.min.css
Fixed merge conflicts
modified table CSS