part1 update
Merge branch 'master' of github.com:aoaoliu/ADB_project2