stashing changes
Merge branch 'master' of https://github.com/zhihaoli/304Project
Merge branch 'master' of https://github.com/zhihaoli/304Project
getting cecile to merge