ignore DS_Store files
fixed asteroids problems
merge
minor fixes
minor fixes