Update for Heroku
Merge branch 'master' of https://github.com/david-davidson/DavidDavidson.io

Conflicts:
	dist/scripts.js