saving local files
resolving merge conflicts
Merge branch 'master' of https://github.com/emilysimonton/code2040_fellows
Merge branch 'master' of https://github.com/emilysimonton/code2040_fellows