jotterbach/git-teachings

This is a way to help understand merge conflicts

Thank you for tutoring me

Here is a merge conflicty edit by Stephanie These are edits by johannes

something new