made apples different for master and feature branch to test merge
merging feature into master branch. In the master branch, mergin other branch, feature, into the current branch.
added more notes after merge
minor change in apples while in feature2 branch
added tree.txt
merging feature2 changes with github changes
apples changed locally