masterfile1 added
added 2nd file to branch feature1
feature file1 added
added feature2.txt
Merge branch 'feature1' of https://github.com/jeril-amagi/testrepo into feature1

pulling changes from feature1