commit file2
modified file2
Merge master and dev
Merge branch 'dev'

Merge master and dev.