Troubleshoot omniauth
Merge branch 'master' of github.com:sirramongabriel/lunch_panoply

Conflicts:
	config/initializers/devise.rb