add 404 html
Merge branch 'master' of https://github.com/iwhiteman/Raptor
404 final
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/main.css