finished
Merge branch 'master' of https://github.com/avoldsund/Optimization-project