changed fixInfinitive() to handle case with conjunctions
Merge branch 'master' of https://github.com/amberr/pa6-translation.git