Added new_file.txt in new_branch
new file added stuff
added yet more stuff to new_file.txt in testbranch
adding to new_file in master
merged and fixed