sync
fixes

Conflicts:
	.DS_Store