I made a change
Conflict resolved.
Merge branch 'master' of https://github.com/gmedrano/GA-GIT-Training