changes to foodBarController, person placeholder
Merge branch 'master' of https://github.com/evanlong19/impatient_god

Conflicts:
	impatient_god/Library/assetDatabase3
Add prefab for CityFolk