Finished frontend
Merge branch 'master' of github.com:sacooper/COMP206-A4-5

Conflicts:
	css/main.css
	error.html