Fixed multiple file issues for ClientServer
Merge pull request #22 from CSLLC-Codeathon-2014/Phone-Info

Fixed multiple file issues for ClientServer