#24 all equations in place
Merge branch 'master' of github.com:ifarup/tc1-82