added debugging to logger, and joined server thread to main method
Merge branch 'master' of https://github.com/Kenkron/P2PFileshare