Work on login.html
Merge branch 'master' of https://github.com/sacooper/COMP206-A4-5

Conflicts:
	css/main.css
	index.html
Merge branch 'master' of https://github.com/sacooper/COMP206-A4-5

Conflicts:
	login.html
	registration.html