before merging
Merge branch 'master' of https://github.com/rogerms/Hello

Conflicts:
	letters.txt