new version of model availiable
Merge branch 'master' of https://github.com/chreman/BA-thesis

'merge from different workstations'