Stephen's test backup
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Translator.java
Merge remote-tracking branch 'origin/master'
commtting changes that I resolved
Merge branch 'master' of https://github.com/amberr/pa6-translation.git
Merge branch 'master' of https://github.com/amberr/pa6-translation.git
added English translations for dev sentences
Merge branch 'master' of https://github.com/amberr/pa6-translation.git