Added tiddler about merging branches; edited colors