Only track the client + README
Updated client + README for uploading files
Resolved merge conflict