pokemon sprites showing up in battle and life points
Merge branch 'design' into gh-pages