Added first version of card text
Merge branch 'master' of https://github.com/cgibson/space-elves

Conflicts:
	models/card.py
	views/card.py
Merge branch 'master' of https://github.com/cgibson/space-elves