renamed bar to bar2
made changes to foo.txt
added another cool change
merged master with new_master