reading json files
Merge branch 'master' of github.com:kfrancischen/CS221_Project

Conflicts:
	dataAccess.py