Ronan's and Enda's Changes from Friday --- Error logging, styling,
Settings page and Navigation bar
Merge branch 'master' of
https://github.com/otisliddy/group-project-repo.git

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