commit after rebase
Merge branch 'master' of github.com:gkazior/gitfun