test git branch
test more branch stuff
finish merge with branchtest before deleting it
Revert "finish merge with branchtest before deleting it"

This reverts commit 1f3a279905da5961ec23e7ca6f655e0131e68c5b.
what did i do
refactored to use Game_State, but segfaults on generating food
fixed seg fault