wrapped up blackjack controller
Merge branch 'master' of https://github.com/tomtwo/amnesia
Merge branch 'master' of https://github.com/tomtwo/amnesia
fixed up bugs in merge
Merge branch 'master' of https://github.com/tomtwo/amnesia