Removed heroku from root, added to dist
Added Procfile and web.js
Trying to fix revert
Reverting again
Trying to fix errors
Merge branch 'master' into newest
Fixed unmerged paths