renamed decoder.m to decoderProto.m
Merge branch 'master' of https://github.com/interrupthandlers/2014Q3
Merge branch 'master' of https://github.com/interrupthandlers/2014Q3