First pages commit for wiki
Added tiddler about merging branches; edited colors
Added note about variable issues
Merged branches