sync5local
sync6

Conflicts:
	.gitignore