Object pronoun / verb switch
Merge branch 'master' of https://github.com/amberr/pa6-translation

Conflicts:
	src/Translator.java