fix css
Merge branch 'master' of git@github.com:robintran/ownproject.git

Conflicts:
	app/assets/stylesheets/popup.css
	app/views/devise/sessions/_new.html.haml