added new.txt on new_file branch
new file added on hotfix branch
finished the new file.
Merge branch 'new_file'