Merging the Tools

adding proto and collabrify