Merge branch 'Greg1-branch2' of https://github.com/NUwebteam/tremontTest into Greg1-branch

Conflicts:
	index.html