dev on master branch...
more local dev
new feature in file B&C
Merge branch 'new_feature' of github.com:pajen/Petters-test into new_feature