migrated db to heroku so should be good now
Merge branch 'candycane'