deleted line
renamed file2 to file2renamed
Merge branch 'renaming3'