playing card
Merge branch 'feature/playingcard' into develop

Conflicts:
	app/index.html