feature 1
added feature 1 at master
made a hot fix
Merge branch 'master' into feature-1