added countdown
Merge branch 'feature/countdown' into develop

Conflicts:
	app/views/cardDetailActive.html
Merge branch 'develop' of https://github.com/danielgould/FacebookTopTrumps into develop

Conflicts:
	app/views/cardDetailActive.html