resolving conflicts
merge conflicts from master and missing angular-animate and pusher asset files
added opponent hand, opponent stack spells, and opponent resolves through pusher