Resolve Merge Conflict
Resolve Merge Conflict

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