wercker deploy
Merge branch 'master' of heroku.com:lc1-challenge-service

Conflicts:
	config/default.yaml
Merge branch 'master' of http://github.com/appirio-tech/lc1-challenge-service