added devise gemfile
Merge pull request #5 from mbetts7/devise_feature

added devise gemfile - for Ashley to check
added to seed file
added a sign in link for linkedin and added secret consumer keys to env files
generated a controller for omniauth_callbacks
I only changed seed file, then pulled in latest master file
added a username column to User model
resolved merged conflicts
added image fields to models
got linkedin openid to work
Merge pull request #7 from mbetts7/model_updates

added image fields to models
resolved merge conflicts
resolved more merge conflicts
resolved some conflicts