Trying to generate a build.
Merge branch 'master' of github.com:Nathan-Wall/hijs

Conflicts:
	index.html
Updating slides and pdf.