Added feature1
Added feature1.txt
Added feature2
Feature2 changes
Merged feature1 and feature2
Added feature3