sed bug fix
Merge branch 'master' of github.com:chasiumen/openstack_centos

Conflicts:
	basic.sh
merge fix