Added custom 404
Added extra archive
Revert "Added custom 404"

This reverts commit b42ac91b8a21d8088f29ae7c24e80389e3a0bf59.
Merge remote-tracking branch 'origin/master'