Merge branch 'master' of https://github.com/michellelinggg/Pacman-AI-with-Adversaries

Conflicts:
	multiAgents.py
working copy
working copy