Changes to client/ added Makefile
Merge pull request #4 from wj313/master

Changes to client/ added Makefile