adding same link to f1 as in feature1 branch
adding test1.html
Merge branch 'feature2'