Intergration of codes. Fixed collision.

Left to do -- Special Zombie
-- update and render for states
-- money system
-- clicking on UI
-- gun bullets
Revert "Intergration of codes. Fixed collision."

This reverts commit d40058027012c420284e5fd8ad0c338142fe5c18.