Add docstring.
Merge branch 'master' of https://github.com/weidongxu84/info-gatherer

Conflicts:
	proxy/views.py