Refactored to create class ServerThread
Updated Makefile
Merge branch 'master' into scaling