DebateFAQDesign
Merge remote-tracking branch 'origin/master'

Conflicts:
	RateMyDebate/RateMyDebate.v12.suo

	RateMyDebate/RateMyDebate/App_Data/RateMyDebate.Models.RateMyDebateContext.mdf

	RateMyDebate/RateMyDebate/App_Data/RateMyDebate.Models.RateMyDebateContext_log.ldf
	RateMyDebate/RateMyDebate/RateMyDebate.csproj
	RateMyDebate/RateMyDebate/bin/RateMyDebate.dll
	RateMyDebate/RateMyDebate/bin/RateMyDebate.pdb

	RateMyDebate/RateMyDebate/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	RateMyDebate/RateMyDebate/obj/Debug/RateMyDebate.csproj.GenerateResource.Cache
	RateMyDebate/RateMyDebate/obj/Debug/RateMyDebate.dll
	RateMyDebate/RateMyDebate/obj/Debug/RateMyDebate.pdb