alephtwo/cs485 — pull request #24 by novoalg (2014-12-15 15:57:40+00:00)
Title: Merge pull request #14 from alephtwo/master

ben's changes