Merge branch 'master' of https://github.com/kkmann/MasterThesis

Conflicts:
	R/simulate.R
Merge branch 'master' of https://github.com/kkmann/MasterThesis

Conflicts:
	R/simulate.R