Merge branch 'master' of https://github.com/numerical-mooc/numerical-mooc
Merge branch 'master' of https://github.com/SigurdAngenent/numerical-mooc
--