login mechanism
Completed login form
Merge branch 'login-54537752'

Conflicts:
	styles/.sass-cache/6539ccf050021de2e681b7098309d6c4ad946c7e/main.scssc