resolve card actions
Merge branch 'master' of https://github.com/shsing2000/ll
try to get websockets in