Changes to new_file_2.txt
Merge branch 'bugFix'