this is the first commit
Merge branch 'master' into feature1
deleted file
added new file to feature2
Merge pull request #2 from dsparagna/feature2

Feature2