updated Makefile to include protobuf files, working on android implementation...
Merge branch 'master' of github.com:pstoica/CS3251-project-4