Updated 2.0

Added to about section.  Added Portfolio and contact pages.  Updated
HTML/CSS on both.
Merge branch 'master' into gh-pages