DWJones/CS-354 — pull request #2 by OKullmann (2013-12-13 13:10:59+00:00)
Title: Master

First switch to master branch.