Merge branch 'master' of github.com:reinteractive-open/installfest_guides
Merge branch 'master' into develop