Merge pull request #6 from im11041991/master

Server
art
backbone collections problems
Merge pull request #7 from jortenberg/master

art
comics populate
comics populate
ignored .DS_Store
ignored .DS_Store
Merge branch 'master' of github.com:GA-WDI-August-Team-Charmander/Marvel-App
collections problems
deleted ds stores
Merge pull request #9 from AdrianMLin/master

do it, pull now.DSFLKDSLKF
merging server