Initial Heroku Deploy preparation complete!
Merge branch 'master' of https://github.com/imkevinxu/totoro
getting ready for deployment
fixed merge conflicts arrrgh