alephtwo/cs485 — pull request #15 by novoalg (2014-11-20 21:41:28+00:00)
Title: Merge pull request #12 from alephtwo/master

Ben, cody, and thoma's updates