t
Merge branch 'master' of https://github.com/vongochung/cat

Conflicts:
	apps/card/process.pyc
	apps/card/views.pyc
	apps/home/views.pyc
	settings.pyc