reset commits to cacf72191b, installed omniauth gems
Merge branch 'master' of https://github.com/miler350/DeviseOmniAuth

Conflicts:
	DeviseOmniAuth/Gemfile