initial commit from local git
Merge branch 'master' of github.com:der-rob/thetest

Initial merge to sync local git with remote git