updated the page structure moving the conent and inner content div into the header and footer rather then on each individual page
fixed error on 404 page and updated messaging
Merge branch 'master' of https://github.com/rclations/toolkit
Merge branch 'master' of https://github.com/hallme/scaffolding