finished v1
Merge branch 'master' of github.com:jimyw/cs247-2104-p3
merge