Chat software merge

Merging client & server