fixed merge error
fixed merge error

RusticiSoftware/TinCan_Prototypes,brianjmiller/TinCan_Prototypes,brianjmiller/TinCan_Prototypes,brianjmiller/TinCan_Prototypes,brianjmiller/TinCan_Prototypes,RusticiSoftware/TinCan_Prototypes,RusticiSoftware/TinCan_Prototypes,RusticiSoftware/TinCan_Prototypes