Add all new files
Merge branch 'master' into gh-pages

Conflicts:
	index.html
fixing what git broke
Merge branch 'gh-pages'