second
Resolve Conflicts:
	.gitignore