first shared with supervisors
Merge branch 'master' of github.com:troniak/thesis