added oh no text
modified hello text
"i hope this makes it in..."
merged text files
updated git-log.txt
updated git logMerge branch 'master' of github.com:blackstock/basic-git