conclusion finished
Merge branch 'master' of github.com:apotheos/thesis-undergrad