test coomit
change greeting
change greeting to spanish
Merge branch 'other'

Conflicts:
	hello.txt

made it englsih
Merge https://github.com/tombedor/test

'pull master branch'
add compadres to greeting