Initial client version commit
Merge branch 'client-start'