change
Merge branch 'master' of github.com:MadeiraCloud/docs

Conflicts:
	source/getting-started/basic.md