Added Attack All functionality
Fixed merge conflicts
fix sounds
added borders to sprite
Fixed sound for Attack All
resolve conflicts, merged sprite-logo
Merge branch 'develop' of github.com:ccstevenson/KenjisQuestFrontend into develop
Changed from nateDev to dev
Merge branch 'develop' of github.com:ccstevenson/KenjisQuestFrontend into develop
erased bullet points from charcters card
Merge branch 'develop' of github.com:ccstevenson/KenjisQuestFrontend into develop
Add a player to loaded game works
Merge branch 'develop' of https://github.com/ccstevenson/KenjisQuestFrontend into develop
characters are added if player is null
merge conflict fixed in css and battleotronic
some changes
fixed merge conflicts
fixing conflicts. Changed var ref to /kenjiDev