finished 2.2
Merge branch 'master' of https://github.com/tkoane/linguistics3