added gems
merge conflict fixed
added some omniauth middleware
replaced gemlock
Merge pull request #1 from thedevshop/omniauth

Omniauth