Grammar and todos -- 3.3.1
Merge branch 'master' of https://github.com/sw701e14/report