initial commit
Merge branch 'master' into gh-pages

Conflicts:
	LICENSE
Back up to speed
Merge branch 'gh-pages'