different escape
Merge branch 'master' of https://github.com/betheluniversity/Tinker

Conflicts:
	tinker/web_services.py