Testing commit
Merge branch 'master' of https://github.com/jorgearj/CloudAid

Conflicts:
	README.md
Updated CloudTaxonomy