Deployment
Merge branch 'master' of https://github.com/pablotdl/ringo

Conflicts:
	deployment/Dockerfile.node