commented out a pre tag in a markdown file. I guess Jekyll didnt like that...
Merge branch 'gh-pages'
restructured colors, added potential triadic scheme, and restyled links
updated link colors
Merge branch 'colorTrial'
conflict resolution