added directory <db>, added to <db>: <schema.sql>, <connection_and_models.rb> || added <marvel erd.jpg>
Merge branch 'master' of github.com:GA-WDI-August-Team-Charmander/Marvel-App
added erd, changed server.rb, changed db/models.rb
Merge pull request #2 from im11041991/master

push test
Merge pull request #1 from AdrianMLin/master

added erd, changed server, changed models
test
updated <models.rb> associations
<marvel erd.jpg> users now have_many :fav_characters || changed models.rb for this too
models and stuff
Merge pull request #3 from AdrianMLin/master

updated models.rb and erd
seed in progress
seed in progress
seed WORKSgit add .
backbone models added
lunch time commit
fixed merge?
Merge pull request #4 from AdrianMLin/master

backbone models added
Merge pull request #1 from GA-WDI-August-Team-Charmander/master

Server