Added feature 1
Added feature 2
Merged feature 2 into master
Added feature 3