local changes
Merge branch 'master' of https://github.com/Masoumeh/MasterThesis
last changes, ready to send to christian