Send and receive
FixMergeConflicts
Send and receive
Merge branch 'master' of https://github.com/teusbenschop/shona
Merge https://github.com/teusbenschop/shona