dfdf
Merge branch 'master' of github.com:GA-WDI-August-Team-Charmander/Marvel-App
commented out script.js and reorganised. also added div#users. || trying to build some visuals and then test out
commented out script.js and reorganised. also added div#users. || trying to build some visuals and then test out
organised by model 'user, badge, comic etc'
listenTo on collection added || created some divs on index with ids to prepare for dom traversal and manipulation
index and styles added
fixed merge error?
Merge pull request #12 from AdrianMLin/master

brace yourselves, merge error is coming!