Delete .DS_Store
Merge remote-tracking branch 'origin/master' into randy

Making randy into the new master.
.DS_Store removed.