This is the readme file for folder1 This is for merge practice edits to README This is a change to test merge with master branch and foo_feature branch mearging each other with README file changed.
Treehouse Example