edit script
Merge branch 'master' of https://github.com/soulski/ci-helloword

Conflicts:
	Procfile