created a better 404 page
styled the error page
Merge remote-tracking branch 'origin/master'