update ennemies , controls , and collectibles and scoring
merge conflict end