PRepping for merge
Merge branch 'master' of https://github.com/whiterson/mockingJay
Battle system updates
Merge branch 'master' of https://github.com/whiterson/mockingJay