added a sign in link for linkedin and added secret consumer keys to env files
generated a controller for omniauth_callbacks
added a username column to User model
got linkedin openid to work
resolved merge conflicts
resolved more merge conflicts