package.json merge conflict
Merge branch 'master' of github.com:numenta/nupic.wallboard

Conflicts:
	package.json