added company to mass assignment of user
removed github_url from user model
add cohort mailer and secret_url
fix merge
start cohort model specs
filled out user factory
changed user schema
added sea lions to seed
fix cohort spec
Merge branch 'master' of https://github.com/sarahjanebland/cohesion
fix actionmailer
removed redundant db call
added current scope
added featured users
added random boot to homepage
added new user when no users in db
fixed bug with nil class
conflict fix
conflict fix
rollback