Create client.h
Create Makefile
Merge branch 'dev'