Merge branch 'master' of https://github.com/sylmarien/workarounds

Conflicts:
	OpenStackNotes.md
Merge branch 'master' of https://github.com/sylmarien/workarounds