Merge pull request #1 from zixuanl/master

Port by liu
ready to start lab4
zixuanl