Created Procfile and altered package.json to work with Heroku deployment
Merging master with development setup
Fixed merges with index.jade