Update
Merge branch 'master' of https://github.com/buendiya/PythonDemo

Conflicts:
	celeryServer/main.py
Update