pushing to pull
Merge branch 'master' of github.com:GA-WDI-August-Team-Charmander/Marvel-App
comic adds working 100%
Merge pull request #17 from AdrianMLin/master

badges.js finished functions, converted mostly from pseudocode
index page and css
preparing for merge
Merge pull request #18 from AdrianMLin/master

SEED.rb: Badge.delete_all, populated badges
index and css
index and css
Merge pull request #21 from im11041991/master

Index and css
just copied from joe's code