Updated model
Merge branch 'master' of https://github.com/phreed/cs376

Conflicts:
	hw2/hvac.slx