Added Google Protocol Buffers folder
Resolving conflicts
Merge branch 'master' of https://github.com/mil0/441collabrify