One emoticon in Another.txt
(fixing my name)
Merge branch 'master' of github.com:cruz/cruz-gits