Modifying the options and choices files to allow for the optimization of the 2 and 3 storey  with inset garage archetype
Merge branch 'master' of https://github.com/NRCan-IETS-CE-O-HBC/HousingModels

this merge is necessary to allow for the optimization of the 2 adn 3 storey house archetypes with inset garage.
Adding two new ESP-r models for 2 and 3 storey houses with inset garages.