- browserify adds react and d3 now
- commit latest changes
Merge branch 'browserify-me' into prototype

Conflicts:
	gulpfile.js
	karma.conf.js
	src/html/index.html