Changes to json import typo
Merge branch 'master' of https://github.com/scmarlatt/EECS445_FunWithYelp

Conflicts:
	correlation.py