Created dev branch for when deploying to heroku
Merging master with development setup
Fixed merges with index.jade