The mess started
Merge branch 'master' of https://github.com/newsoulbr/gitminicourse

Conflicts:
	convertToJaponese2.py