text code for heroku
Merge branch 'master' of heroku.com:lifeup

Conflicts:
	routes/log.js