updated card view
Merge branch 'master' of github.com:ehzhang/jade

Conflicts:
	apps/poll/utils.py
updated card