Add OmniAuth Gems
fixed merge conflict
Merge branch 'brandonjyuhas-master'
fixed merge conflict