Still fixing deckmanager
this is redudant Merge branch 'master' of github.com:gabrielappleby/heartofthecards