Adding Otis changes
Merge branch 'master' of
https://github.com/otisliddy/group-project-repo.git

Conflicts:
	group1-sprint2/src/main/webapp/js/main.js
Admin CSS and cookies
Merge branch 'master' of
https://github.com/otisliddy/group-project-repo.git

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