The stuff before food
alright
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/GameManager.cs
	Assets/scripts/Player.cs