version 0.0.0
wtf
Merge branch 'gh-pages'

Conflicts:
	scripts/entry.js

merged