hopefully things don't fall apart
Merge branch 'master' of https://github.com/gnedivad/Translator

Conflicts:
	python/Translator.py
	python/googleDict.pyc
asdf