Implemented battleCards update
Merge branch 'master' of https://github.com/ericapadilla/testRepo