created dummy_file_1
Merge branch 'master' into added_dummy_file_2