edited file2

edited file1
Merge branch 'master' into dev