remote comma cuz it fucks up heroku
Merge branch 'develop' into staging
fixed package.json