Added client-server code
added .ignore dir to .gitignore
Merge branch 'master' into test