ignore .idea
Merge remote-tracking branch 'origin/user_model'
Adding omniauth
Merge branch 'master' into development
login style