some styling
fixed conflicts

Conflicts:
	login.html