sync

sync
conflict

Conflicts:
	.gitignore