added feature
added rebase file
Merge branch 'master' of github.com:patrikbreitenmoser/gittest