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 #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
Merge remote-tracking branch 'upstream/master'
Removing devsite tag
Update index.html
fixed all the khan to be just khan
Merge pull request #26 from bgoldy/master

fixed all the khan to be just khan
Merge remote-tracking branch 'upstream/master'