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 #1 from AdrianMLin/master

added erd, changed server, changed models