Merge branch 'master' of github.com:bregman-arie/devops-exercises into devel

Author: abregman