Solarization

Conflicts:
	.gitmodules