added mutex in struct, we should use it
Merge branch 'master2' of https://github.com/HeiSann/Prosjekt into master2