commit
Merge branch 'master' of https://github.com/Scheder/MLII_Project.git

Conflicts:
	src/classifier/CodebookClassifier.java