modified by JA
Merge branch 'master' of github.com:javalos/git_exercises