.

Conflicts:
	Dockerfile