adding 2 seperate directories for client and server
Merge branch 'master' of https://github.com/col726/PMSP