Initial commit
Add DS_Store to gitignore
Fix conflict