Merge branch 'master' of heroku.com:calmunch
fixed data
fixed data again
Merge branch 'master' of https://github.com/aykamko/calmunch