add login failed message / CREATE NEW REGISTRATION IF YOU CAN'T LOG IN
Merge branch 'master' of https://github.com/San-Diego/PHP-Teamwork
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/elements/login_form.php

test