Adding a text file
add all of the files
Merge branch 'master' of github.com:charliedowler/try_git