Merge branch 'master' into 'master'

test message See merge request !6

Merge branch 'master' into 'master'
test message See merge request !6
8c2ca77c · esadgrov · 597e08a6 · a9defec0 · 8c2ca77c
Commit 8c2ca77c authored 7 years ago by esadgrov
--- a/collaboration.txt
+++ b/collaboration.txt
-This is eddie's edition to this work!
\ No newline at end of file
+This is eddie's edition to this work!
+test
\ No newline at end of file