weird change
Merge remote-tracking branch 'origin/master'

Conflicts:
	ARCCProposal/Views/Score/Index.cshtml

	ARCCProposal/obj/Debug/ARCCProposal.csprojResolveAssemblyReference.cache