Context
Merge branch 'master' of https://github.com/rockztar/Project1

Conflicts:
	RateMyDebate/RateMyDebate.v12.suo

	RateMyDebate/RateMyDebate/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache