many updates
Merge branch 'master' of github.com:PMurph/HCI_Project

Conflicts:
	housing.html