frenchie16/wpi-suite-team6 — pull request #6 by Egg3141592654 (2013-11-19 01:03:15+00:00)
Title: Client server dev

Third time is a charm guys...

Merged with dev and tested to ensure that it compiled and ran.