playing with logins
merge conflict management

Conflicts:
	web.js