Removed DS_Store
Merge branch 'fb_local'