app/assets/javascripts/clients.js.coffee

client fuctionality
remove merge conflict
conflict remove