Remove a .DS_Store that got in there
Add .DS_Store to .gitignore
Merge branch 'master' of github.com:rtoal/chuzr