changed the location of some code to a better place
Merge remote-tracking branch 'coyotte/design' into design
rankings
more battle window design
Merge branch 'design' of github.com:Jirachier/webclient into design
updated db
more battle design updates
removed html/css used for testing
changing the design for battles as requested by coyotte
changing the pokeballs in the battle window
Update README.md
forgot to add the actual pokeballicon img
Merge remote-tracking branch 'jira/design' into design
Merge branch 'design' into gh-pages