Ignore DS_Store
Merge branch 'master' into user_crud_for_admin