Remove .DS_Store files.
Merge branch 'master' of github.com:rosscooperman/betterspacecal

Conflicts:
	.DS_Store