step 2
trying to resolve conflict

Merge branch 'master' of https://github.com/hugokoopmans/dataMineR

Conflicts:
	.RData
	2-data-preperation/data-preperation-report.html
	2-data-preperation/data-preperation-report.md