Merge branch 'develop' into heroku-config
node dist/server.js
Merge branch 'heroku-config' into develop