local file
Merge branch 'master' of https://github.com/MariaBarrett/Datamining-project

Conflicts:
	featuremap.pyc
...