bit merge
Merge branch 'master' of https://github.com/lhbt/HackManchester

Conflicts:
	Heisenberg.v11.suo
	Heisenberg/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache