adds DS_Store to .gitignore
commit again
AVATARS
Dumb DS Store
DS Store
Merged Preston's branch again.