Ignore .DS_Store
Ideas
Basic auth and user
Merge with origin master