First commit
Raffi Test Commit
Updated server side code
Merged Server/GUI/Client together