fix spelling
Merge branch 'master' of github.com:/uh-nmb/KASPAR

Conflicts:
	setup.py