Add underscore
Synchronize creatures and shots
Fix merge cockups
Load in creatures passed in
Merge branch 'battle-start'