repositioned characters and enemies.
Merge branch 'develop' of https://github.com/ccstevenson/KenjisQuestFrontend into battleLayout
Update on character portrait sizes.
Merging conflicts with develop.
merging changes from develop onto feature branch.
Merge branch 'develop' into battleLayout
responsiveness v1. woot.
fixed merge conflicts