~
Merge branch 'master' of https://github.com/Eliminate/Trendata

Conflicts:
	cgi-bin/category.py