feature  A added
Merge branch 'development' of github.com:tiemevanveen/RebaseTest into featureB