added traps to 2.2
Merge branch 'develop' of github.com:yash3ahuja/CS496-CovertProtocol into develop