i didnt change anything, you piece of shit
merge conflicts
Merge branch 'master' of github.com:gabrielappleby/heartofthecards
what
Merge branch 'master' of github.com:gabrielappleby/heartofthecards