Added *conflicted copy* to .gitignore.

Will ignore Dropbox conflicted files.