create openstack
first line
Merge branch 'davy'

Conflicts:
	openstack platform/readme.txt