added 404
Merge branch 'master' of https://github.com/yyjhao/NUSMorge