Testing => Taesting
Merge pull request #4 from JonasHazell/danielsreadmebranch

Testing => Taesting
Conflict test
Rebase