facebook added to authorizations
merging for dunno what

Merge branch 'master' of https://github.com/didyoueven/bulbasaur-web

Conflicts:
	app/models/user.rb
	db/development.sqlite3
	db/schema.rb