Implement some tests
Merge branch 'master' of github.com:liamlin/playing-cards

Conflicts:
	war/cards/tests.py