Added threading to server classes; changed watchdog files to exclude directories; changed server classes to integrate Twisted and socket servers.
Merge remote-tracking branch 'origin/master'

Conflicts:
	watchDir/userInput.py