Hello gitworld!
Merge branch 'master' of https://github.com/nicolas-cajelli/oscon-workshop