Merge pull request #220 from progracqteur/master

Merge pull request from progracqteur/master
Merge branch 'master' of git://github.com/progracqteur/WikiPedale
adding .DS_Store to gitignore