added feature 2
work on ft 2
Merge branch 'feature/feature_2' into develop