fixed alison joy
Merge branch 'master' of https://github.com/Neteshy/icc505-F13

Conflicts:
	groups/4/buildings/Newhouse.html