theory for merge
Merge branch 'master' of https://github.com/Xander89/master_thesis
cleanup + END FINISH DONE DONE DONE!!!!!!!!!!!!!!!!!!!!!