ignore .DS_Store
Merge branch 'master' of github.com:maixezer/POS-Z

Conflicts:
	.DS_Store
remove doc/.DS_Store