Conflicts:
	.gitignore
	INSTALL.txt