enter action
Merge branch 'master' into login_view
Merge branch 'master' into add_persistance

Conflicts:
	views/login.html.ejs