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

Work please
Merge branch 'master' of github.com:GA-WDI-August-Team-Charmander/Marvel-App

Conflicts:
	public/javascripts/script.js
create characters working
Merge branch 'master' of github.com:GA-WDI-August-Team-Charmander/Marvel-App
fav character create done, append for new character almost done
fixed merge
um, hope theres no merge error