updated redirects to move /live to new site -- need to figure out what / how we get folks access to the old content...
redirects conflict fixed
Merge branch 'master' of https://github.com/googlecloudplatformsite/GoogleCloudPlatformSite.github.io

merging from upstream
removing old redirects file
Merge pull request #21 from ryanpollock/master

Update index.html
Update phase2.html
Fixed nav icon dropdown in Products and apostrophes in customers listing
Merge remote-tracking branch 'upstream/master'
Merge pull request #22 from natech/master

Fixed nav icon dropdown in Products and apostrophes in customers listing
Add sentence about ISO/IEC compliance for Cloud SQL

http://b/16958905
Merge pull request #23 from chenmike-g/master

Add sentence about ISO/IEC compliance for Cloud SQL
Re-fixing nav icon dropdown
Merge remote-tracking branch 'upstream/master'
Merge pull request #24 from natech/master

Re-fixing nav icon dropdown
Merge branch 'master' of https://github.com/googlecloudplatformsite/GoogleCloudPlatformSite.github.io

merging upstream
Hooking up to correct layout
Update phase2.html
Update _config.yml
Update phase2.html
Update doctest.md