added a page, and changed header. added colors to list.
Merge branch 'master' of https://github.com/teamthuglyfe/SSSE2014_team6