Merge branch 'master' into work
Week 4 Work

Have 2 mashups complete.  Fleshing out CSS and final details.
Merge branch 'work' into gh-pages