added Diagnose option
Merge branch 'master' of github.com:mies/hello-laika

Conflicts:
	wercker.yml