merging from master branch
Merge branch 'master' of heroku.com:goodbets
Merge branch 'master' of https://github.com/rmathew1992/compCharity