Add site footer
Resolve merge conflict
Package 404 page to be deployed anywhere