fit bugs with merge
Merge branch 'master' of https://github.com/wulifu2hao/CS3213VisualIDEnew