add things in setting page
Merge branch 'master' of https://github.com/wilwong/csc309-v2