Deliberate merge conflict
Created a deliberate merge conflict
Fixed merge conflicts
Merge branch 'master' into TLR/Add-git-workflow-to-readme

Merging new readme with old readme
Merge pull request #11 from KevinFalank/TLR/Add-git-workflow-to-readme

Tlr/add git workflow to readme