demoing a change to the 404 page
testing 404 more
testing 404 on newBranch branch
fixed conflict
removed demo rubbish from 404
Merge pull request #1 from sammyjopeters/newBranch

Changed stuff, and then changed it back. So nothing changed. HAAAHAHA