line change
Merge branch 'master' of github.com:jimyw/cs247-2104-p3
merge
added split of v1 and v2, added send1, send2, receive1, receive2