Merge pull request #28 from david-on-github/David-Dev

David dev
Merge pull request #29 from david-on-github/David-Dev

Delete testfile locally.
Merge pull request #30 from david-on-github/David-Dev

Local change after remote merge into develop.
Create change-pushed-by-someone-else
Merge pull request #31 from david-on-github/David-Dev

local change while someone pushes to develop
Merge pull request #32 from david-on-github/develop

test merge