Massively simplified the login process. Working on the content management page.
Merge branch 'master' of github.com:bensaward/OW-new-website

Conflicts:
	about.html
	css/about.css