styled sign-in
Updating sign-in
Merge branch 'master' of github.com:danlinde/sifiapp

Conflicts:
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.erb