Updated
Updated
Merge branch 'devel' of https://github.com/ongoworks/rocker-docker into devel
Merge pull request #40 from ongoworks/devel

Updated 3-settings