Commit Client & Server to master