testing conflicts
Merge branch 'master' of https://github.com/thenhkid/universalTranslator

Conflicts:
	thingstodo.txt