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 branch 'master' of https://github.com/googlecloudplatformsite/GoogleCloudPlatformSite.github.io

merging upstream