Title: Conflict 1 task 2
Merge branch 'master' of jan-git-sandbox:davidatgithub/git_workflow_example

Conflicts:
	b.txt