commit 2 in master
Merge branch 'develop'