Update

changed some colors and linked two pages
Merge branch 'Work' into gh-pages