Conflict test
Conflict test
Rebase
Merge pull request #6 from JonasHazell/test-conflict

Conflict test