ooped the client and removed useless logging prefixes
Merge branch 'master' of github.com:TheDan64/secret-octo-bear

Conflicts:
	client.py
	files.py
	lib/client.py