Merge branch 'master' of https://github.com/fatevil/Black-Jack