my older changes before Evan fixed things
Merge branch 'master' of github.com:WheatonWHALE/cinemapAPI

Conflicts:
	index.js