Updated user status to in battle or in queue
Updated user status and awarded coins after battle
Merge branch 'master' of https://github.com/ericapadilla/testRepo