no message
Merge branch 'master' of ssh://github.com/thenhkid/universalTranslator

Conflicts:
	thingstodo.txt
Merge branch 'master' of ssh://github.com/thenhkid/universalTranslator