add feature3
Merge branch 'master' of github.com:armeo11/git_test