johnsturm/cs109 — pull request #13 by atucker (2013-12-08 01:38:50+00:00)
Title: merging work so far

I think this should work