Made new branches

New work branch and gh-pages branch.
Mashup Work

Weather + Geolocation working.  Need to adjust visually.
Merge branch 'master' into gh-pages