something
Merge branch 'master' of https://github.com/waldronj/HackTheMidwest2013

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