revert
Merge branch 'gh-pages' of https://github.com/gouwestadmm/basis into gh-pages

Conflicts:
	_site/js/main.js
	js/main.js