Renamed folder to match new repo name.
Adding to .gitignore.
Added to .gitignore.
Removed .DS_Store from repo.
Resolved merge conflict in .gitignore.