Handshaking now working
Merge branch 'master' of github.com:robz/CS354R-Project3