shit
Merge branch 'master' of https://github.com/DatCorno/Pi-Client-Server

Conflicts:
	Pi Client Server/Log.pyc
	Pi Client Server/ServerErrorLog.log
sauce
au poivre
Merge branch 'master' of https://github.com/DatCorno/Pi-Client-Server

Conflicts:
	Pi Client Server/Client.py
	Pi Client Server/ClientErrorLog.log
	Pi Client Server/Handler.pyc