farahfouladi/cosc460 — pull request #26 by lyeary (2014-11-17 23:03:11+00:00)
Title: Merge pull request #9 from farahfouladi/master

merge