Adding a text file
Merge branch 'master' of https://github.com/fancellu/try_git