updated summary
Merge branch 'master' of github.com:yz224/521final