Added the ability for clients to contact the DNS and download the list of existing clients
Merged the previously conflicting files