404 added
Merge remote-tracking branch 'origin/master' into gh-pages
Merge pull request #1 from travisneilson/gh-pages

Add 404