Merge branch 'william'

-m "some webroot stuff!"
fuck you

Merge branch 'william' into chris
fuck
Merge branch 'chris' of github.com:El-Wilio/konfirmed into chris
changed stuff
Merge remote-tracking branch 'origin/william' into william

Conflicts:
	code/config.php
	code/scripts/login.php
	webroot/ajaxRequest.php
	webroot/login.php
	webroot/stylesheets/style.css
.

.