JAFB/cpsc301Proj — pull request #16 by BrennanJones (2012-03-27 05:35:11+00:00)
Title: Third Attempt

Third attempt at merging changes.