first commi
fix the merge conflict
Merge branch 'master' of https://github.com/smblanchard/trisha-sarah-workshop