tmp commitw
Merge branch 'master' of https://github.com/allenpark/cardblocks
basic ai
merge conflict?