added ignore file
overrode ignore file
modified hello.txt
hmm ok
Merge branch 'new_branch'