Merge branch 'master' into 'patch-3'

# Conflicts: # CONTRIBUTING.md

Merge branch 'master' into 'patch-3'
# Conflicts: # CONTRIBUTING.md
b2a8f366 · Steve Weber · 880389a6 · 841f4e98 · b2a8f366
Commit b2a8f366 authored Apr 14, 2020 by Steve Weber 💠
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CONTRIBUTING.md CONTRIBUTING.md +2 -1

No files found.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
 Steve Weber - s8weber@uwaterloo.ca
 James McCarthy - jmccarth@uwaterloo.ca
-Mirko - mvucicev@uwaterloo.ca
\ No newline at end of file
+Mirko - mvucicev@uwaterloo.ca
+yahoo