merge conflict!

:(
Merge branch 'master' of https://github.com/titse/COGS187B-project