changes
getting rid .ds_store

Conflicts:
	.DS_Store