merged
removed extra file
i think it works now
Merge branch 'master' into game_logic
merged