Merge branch 'master' of https://github.com/rutgerg/centos-recipe

Signed-off-by: Rutger <rutgergeelen@schedjoules.com>

Conflicts:
	README.md
Merge remote-tracking branch 'origin/master'