deleted 404.html
Merge branch 'gh-pages' of https://github.com/jklontz/data into gh-pages

Conflicts:
	404.html

rm .git/MERGE_HEAD