dhyee/COGS-Final-Project — pull request #2 by christinedo (2014-12-11 06:34:22+00:00)
Title: trying to merge pt. II

:santa: