Feature 1
Feature 2.1
feature 2 done
Merge feature2 into master