who knows
Merge remote-tracking branch 'origin/master'

Conflicts:

	ARCCProposal/obj/Debug/ARCCProposal.csprojResolveAssemblyReference.cache