Added feature_3 with (file feature_3)
Merge branch 'feature_3' into develop (added feature_3 with new file:feature_3)