update to new structure
Merge branch 'master' of https://github.com/jonyardley/hadron.js

Conflicts:
	app/index.html