correct_user.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/user.html