Battles now award XP and CP

fixes #152