add touch new_file.txt
add touch new_file_2.txt from eric
add another_new_file.txt
add other_file.txt
Merge branch 'eric'