Merge pull request #1 from nmitra/master

added Camouflage and Sybil
Merge https://github.com/amandachan/2013-FYP