rankings
Merge branch 'design' of github.com:Jirachier/webclient into design
updated db
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
add battle.html to watching battles
fix db urls
fixing problem with items_list in getgenerationinfo method
fixing the itemslist in teambuilder
fixing the design of the battle window
changing the tab back to #teambuilder
Merge branch 'design' into gh-pages