Changes to a lot of file with adj/vb
Merge branch 'master' of https://github.com/scmarlatt/EECS445_FunWithYelp

Conflicts:
	main.py