farahfouladi/cosc460 — pull request #15 by lyeary (2014-10-07 01:11:35+00:00)
Title: Merge pull request #3 from farahfouladi/master

lab 3 milestone pull