start of omniauth
Facebook omniauth login
twitter oath
using ENV variables... need to change this
Merge remote-tracking branch 'origin/mongoid'

Conflicts:
	Gemfile.lock
	config/routes.rb