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

Conflicts:
	public/javascripts/script.js
fixed merge
badges working
um, hope theres no merge error
so there were merge errors, trying again now
badges.js
add comics working kinda...
badges.js: pseudocode logic done for fav_char_in_read_comic badge
making functions for badges.js
time to merge
Merge pull request #16 from AdrianMLin/master

Badges.js
badges.js finished functions, converted mostly from pseudocode
comic adds working 100%
Merge pull request #17 from AdrianMLin/master

badges.js finished functions, converted mostly from pseudocode
index and css