Broken
Unbroken, basic integration
Style changes
Merge branch 'pluginify'

Conflicts:
	3av.css
	bundle.js
	index.html
Post-merge cleanup