set up glass side of demo
implemented POC web integration
Merge branch 'web-integration'
merged
merged web integration
integrated the heatmap and web branches
added test pages
set up Jekyll for github pages
Set up jekyll for github pages

Merge branch 'gh-pages-2' into gh-pages

Conflicts:
	prototyping.html