add everythign from client
Merge branch 'master' of github.com:nvolungis/lynch-proto