ignore the .ds_store
take 2
why why
Merge branch 'master' of https://github.com/halad/SlickGrid

Conflicts:
	.DS_Store
	.gitignore
conflict resolution
fix