Add Facebook login
Finish login with auth
Merge remote-tracking branch 'upstream/master' into fb

Conflicts:
	Gemfile
	Gemfile.lock
	README.md
	app/assets/stylesheets/custom.css.scss
	app/assets/stylesheets/scaffolds.css.scss
	app/models/user.rb
	app/views/layouts/_header.html.erb
	app/views/layouts/application.html.erb
	app/views/static_pages/home.html.erb
	db/schema.rb
Merge branch 'fb'

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/custom.css.scss
	app/assets/stylesheets/scaffolds.css.scss
	app/models/user.rb
	app/views/layouts/_header.html.erb
	app/views/layouts/application.html.erb
	app/views/static_pages/home.html.erb
	db/schema.rb