initial commit
finished feature1
feature2 done
Merge branch 'feature2'