pull from github to update
fixed food position, added food collision code
fixed food position, added food collision code
local rebase to fix git unsync
local rebase to fix git unsync
local rebase to fix git unsync part 2
Merge origin/master

Conflicts:
	nbproject/private/private.xml