fix
fix
Merge branch 'master' of github.com:19thhell/DemandSideMicroGrid

Conflicts:
	DemandSideMicroGrid.cpp