stupid
Merge branch 'master' of https://github.com/gwillad/syllabest
Merge branches 'chris' and 'master' into chris