added feature2
Merge branch 'master' of https://github.com/armeo11/git_test