updated values
Merge branch 'master' of https://github.com/ARoundSquare/masters-thesis