Update

Fix dealing with score over 21
Merge remote-tracking branch 'origin/master' into gh-pages