import
Merge branch 'master' of https://github.com/Tjitte/Computational-Intelligence

Conflicts:
	naamloze map/importData.asv