Site added to master branch
Merge branch 'master' into populateAndSite

Conflicts:
	group1-sprint2/src/main/webapp/css/server.css
	group1-sprint2/src/main/webapp/index.html
	group1-sprint2/src/main/webapp/js/main.js