ryanmp/cs325 — pull request #8 by 1n5aN1aC (2014-03-18 18:37:15+00:00)
Title: Client server -> Master

Just final cleanup.