farahfouladi/cosc460 — pull request #42 by lyeary (2014-12-09 00:44:11+00:00)
Title: Merge pull request #15 from farahfouladi/master

Merge pull request #41 from lyeary/master