wakari merge
Merge branch 'master' of https://github.com/aread85/numerical-mooc