lyeary/cosc460 — pull request #14 by lyeary (2014-11-22 18:12:36+00:00)
Title: Merge pull request #40 from lyeary/master

merge