First commit
Merge branch 'master' of github.com:Rovansteen/workflow-template

Conflicts:
	README.md