global update
Merge branch 'gh-pages'

Conflicts:
	assets/css/custom.css
	index.html
Merge branch 'gh-pages'

Conflicts:
	assets/css/custom.css
	index.html
d3 js integration
d3 js integration cancel