Styling for annotation signup / login popup
resolving conflicts

Conflicts:
	public/css/style.css
	public/sass/style.scss