Sign in popup
Merge branch 'master' into popup_jfb

Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/_header.html.erb
Merge pull request #48 from JoshFB/popup_jfb

Add sign in modal popup