add battle.html to watching battles
Merge branch 'design' into gh-pages