add multi module
Merge branch 'master' of https://github.com/djgagne/bootcamp
try to resovle the conflict