farahfouladi/cosc460 — pull request #41 by lyeary (2014-12-03 19:15:10+00:00)
Title: Merge pull request #14 from farahfouladi/master

Merge pull request #40 from lyeary/master