Debugged Merge Conflict Result
Debugged Merge Conflict Result

adriansoghoian/Discoveree,adriansoghoian/Discoveree,woodchucks-2014/Thoughtly,digideskio/Thoughtly-1,digideskio/Thoughtly-1,Shuffguy/Thoughtly,Shuffguy/Thoughtly,woodchucks-2014/Thoughtly,digideskio/Thoughtly-1