worked on some shiate
shtuff
Merge branch 'master' into Roger
Merge branch 'master' into Roger

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/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
Minor CSS changes
Merge branch 'master' into Roger

Conflicts:
	ClassProject/ClassProject/bin/ClassProject.dll
	ClassProject/ClassProject/bin/FCTDataModel.dll
Merge branch 'master' into ryan2
Merge branch 'master' into Roger
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
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
Added ISBN Number and hid student section
Updated libraries to fix intellisense and figured out issue with AJAX URL
stinky suo
Merge branch 'Roger'