Added match against  keyword/solution
Merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	CIS526_FinalAssignment.Tests/bin/Debug/CIS526_FinalAssignment.Tests.dll
	CIS526_FinalAssignment.Tests/bin/Debug/CIS526_FinalAssignment.Tests.pdb
	CIS526_FinalAssignment.Tests/bin/Debug/CIS526_FinalAssignment.dll
	CIS526_FinalAssignment.Tests/bin/Debug/CIS526_FinalAssignment.pdb
	CIS526_FinalAssignment.Tests/obj/Debug/CIS526_FinalAssignment.Tests.csproj.FileListAbsolute.txt
	CIS526_FinalAssignment.Tests/obj/Debug/CIS526_FinalAssignment.Tests.csprojResolveAssemblyReference.cache
	CIS526_FinalAssignment.Tests/obj/Debug/CIS526_FinalAssignment.Tests.dll
	CIS526_FinalAssignment.Tests/obj/Debug/CIS526_FinalAssignment.Tests.pdb
	CIS526_FinalAssignment.Tests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	CIS526_FinalAssignment.v11.suo
	CIS526_FinalAssignment/App_Data/CIS526_FinalAssignment.Models.PlayerDBContext.mdf
	CIS526_FinalAssignment/App_Data/CIS526_FinalAssignment.Models.PlayerDBContext_log.ldf
	CIS526_FinalAssignment/CIS526_FinalAssignment.csproj.orig
	CIS526_FinalAssignment/Controllers/TaskController.cs
	CIS526_FinalAssignment/Views/Shared/_Layout.cshtml
	CIS526_FinalAssignment/Views/Shared/_Layout.cshtml.orig
	CIS526_FinalAssignment/bin/CIS526_FinalAssignment.dll
	CIS526_FinalAssignment/bin/CIS526_FinalAssignment.pdb
	CIS526_FinalAssignment/obj/Debug/CIS526_FinalAssignment.csproj.FileListAbsolute.txt
	CIS526_FinalAssignment/obj/Debug/CIS526_FinalAssignment.csproj.FileListAbsolute.txt.orig
	CIS526_FinalAssignment/obj/Debug/CIS526_FinalAssignment.csprojResolveAssemblyReference.cache
	CIS526_FinalAssignment/obj/Debug/CIS526_FinalAssignment.dll
	CIS526_FinalAssignment/obj/Debug/CIS526_FinalAssignment.pdb
	CIS526_FinalAssignment/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	CIS526_FinalAssignment/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache