stuff
Merge branch 'master' of https://github.com/LinuxMercedes/data-mining-notes

Conflicts:
	test3.tex
fixed merge conflict