happy with this
Merge branch 'master' of github.com:keyvanfatehi/docker-crunx

Conflicts:
	Dockerfile