lyeary/cosc460 — pull request #6 by lyeary (2014-09-22 19:32:08+00:00)
Title: Merge pull request #8 from lyeary/master

Merge pull request #5 from farahfouladi/master