view update

view update
Merge branch 'view'
Merge branch 'master' of https://github.com/CS2112JSXW/CS2112_HW6