Merge remote-tracking branch 'origin/master'

untitled folder/nectar/APIpassword.txt

untitled folder/nectar/host_vars/nectar.yaml

untitled folder/nectar/nectar.retry

untitled folder/nectar/nectar.yaml

untitled folder/nectar/roles/openstack-common/main.yaml

...tled folder/nectar/roles/openstack-images/tasks/main.yaml

...ed folder/nectar/roles/openstack-instance/tasks/main.yaml

...der/nectar/roles/openstack-security-group/tasks/main.yaml

untitled folder/nectar/roles/openstack-setup/tasks/main.yaml

...er/nectar/roles/openstack-volume-snapshot/tasks/main.yaml

...tled folder/nectar/roles/openstack-volume/tasks/main.yaml

untitled folder/nectar/run-nectar.sh

untitled folder/nectar/unimelb-comp90024-group-69-openrc.sh

untitled folder/setup/APIpassword.txt

untitled folder/setup/deployment_key.txt

untitled folder/setup/host_vars/nectar.yaml

untitled folder/setup/hosts

untitled folder/setup/nectar.retry

untitled folder/setup/nectar.yaml

untitled folder/setup/roles/common/tasks/main.yaml