stuff with a feature branch
Merge branch 'master' of https://github.com/sverweij/testington into messup-the-readme