some changes
Merge branch 'master' of https://github.com/viettrung9012/cs3213-a3