Typo

[tengssh]

Thank you for the workshop materials!
I found a typo at

git-intro/content/merging.md

Line 4 in 233430f

It also allows different people to work on the same project at the same. This

It should be: ... at the same "time."

[bast]

Thank you!

[nightcityblade]

Hi, I'd like to work on this. I'll submit a PR shortly.