Merge pull request #1 from dashinfall3/Omar

working on controllers
oauth working
Merge pull request #2 from dashinfall3/oauth

oauth working
Carrierwave working
gemfile fixed