added karma to project for testing
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/jarvis
	package.json