added file feature3.txt to feature-3 branch
updated file feature2 from feature-3 branch