conclusion revised
Merge branch 'master' of github.com:matoilic/thesis