add 4 to feature4
Merge branch 'master' of github.com:tsarocha/git_training