removed .DS_Store OS file
Merge remote-tracking branch 'origin/master'

Merging local branch with repository changes from zf72. I removed an OSX file from my local copy.