commite
Merge branch 'master' of https://github.com/unionthugface/hackathons-energy

Conflicts:
	EnergyHack/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
commit
Merge branch 'master' of https://github.com/unionthugface/hackathons-energy

Conflicts:
	EnergyHack.v12.suo
	EnergyHack/bin/EnergyHack.dll
	EnergyHack/bin/EnergyHack.pdb
	EnergyHack/obj/Debug/EnergyHack.dll
	EnergyHack/obj/Debug/EnergyHack.pdb