style: forgot_password.html
style: singup.html
bla
Merge origin/master

Conflicts:
	css/ale.css