revised summary
Merge branch 'master' of https://github.com/zhuob/Project3