fix all .DS_Store
Merge pull request #23 from NicolasBadey/master

Fix all .DS_Store
.gitignore -add .idea
Merge remote-tracking branch 'origin/master' into dev-version0.3

Conflicts:
	.gitignore