jcheng26 ssong55: fixed test cases
lchen59 paulkim6 fix bugs with battle logic

- null pointer exceptions
Merge branch 'master' into US15