Zoie added herself as a contributer
Resolve merge conflict

Learning how to do merge conflicts in Git /GitHub
Merge branch 'master' of https://github.com/dagilleland/ASchool