Merge branch 'jourdans'
Merge branch 'master' of https://github.com/westjour/CodeMichApp