CSc436/Project-4x — pull request #36 by whitely (2014-04-26 22:32:39+00:00)
Title: Merge and close

I checked client-side for bugs during merge. I'm switching focuses so I don't want code stagnating on the branch.