updated protocol for milestone 2
Merge branch 'master' of https://github.com/entice/protocol