server changes
Merge branch 'master' of github.com:GA-WDI-August-Team-Charmander/Marvel-App
pulling
pulling
html/css first
html/css 2nd
trying this again
Merge pull request #15 from im11041991/master

Work please