Added file to feature1
Merge branch 'master' into feature1
Merge pull request #1 from PhilippeLamarche/feature1

Added a file