Kinda caching
Merge branch 'master' of https://github.com/DaveAndEric/MarvelAPI

Conflicts:
	server.js