Homework 4
Merge branch 'master' of github.com:andersjo/scientific-programming-2014