map reduce complete
Merge branch 'master' of github.com:pstoica/pow-viz

Conflicts:
	app.js