some changes
Merge branch 'master' of github.com:tschmidleithner/softwaretesting