assignment 3
Merge branch 'master' of https://github.com/andersjo/scientific-programming-2014