bug fixes
Merge branch 'master' of github.com:inf1op/unimon
Merge branch 'master' of github.com:inf1op/unimon
changes to battle
Merge branch 'master' of github.com:inf1op/unimon