Card now has color when number is rolled
Merge conflict in client.js