Conflicts resolved corrections
Merge branch 'master' of heroku.personal:matchmakr
corrections
corrections