user associations
Merge branch 'master' of https://github.com/jcburke14/dugong
getting ready for heroku
Merge branch 'master' of https://github.com/jcburke14/dugong