.
.
Merge branch 'master' of github.com:jtopjian/openstack-workshop

* 'master' of github.com:jtopjian/openstack-workshop:
  .
  .