committing original
Merge branch 'master' of https://github.com/NRCan-IETS-CE-O-HBC/HousingModels

Conflicts:
	OptFramework/OPTIONS-generic.options