garryk/CSCI3155Paper — pull request #2 by minorl (2013-04-22 17:28:55+00:00)
Title: Merged changes

Needs to be edited for cohesion