css changes
Merge branch 'master' of github.com:ericlathrop/blackjack

Conflicts:
	.sass-cache/7590604831d7b0b59cf900798f164f15bd7c04d7/_card.scssc
	.sass-cache/7590604831d7b0b59cf900798f164f15bd7c04d7/_table.scssc
	scss/_card.scss
	scss/_table.scss
Merge branch 'master' of github.com:ericlathrop/blackjack
 fixing merge
Merge branch 'master' of github.com:ericlathrop/blackjack