lyeary/cosc460 — pull request #17 by lyeary (2014-12-09 00:46:03+00:00)
Title: Merge pull request #43 from lyeary/master

Merge pull request #16 from farahfouladi/master