Merge pull request #10 from natech/master

Edit products template name and update partners json
new haddop page test
Replace master branch with page content via GitHub
Revert "Replace master branch with page content via GitHub"

This reverts commit 70c6dfe84129bfdcf784d90d95ae27328fe1e460.
Update index.html

updating pricing per hoffa
Merge pull request #13 from ryanpollock/master

Update index.html
Merge pull request #14 from natech/master

Next round of edits to Cloud site
Update index.html
Update index.html

undo demo (rollback)
Update phase2.html
Update phase2.html

added "Go to Cloud Console" link with right url to header (no more logout widget - always live)
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/bgoldy/bgoldy.github.io
fixed event id for go to console
Update Canvas link on /products/app-engine/

Fixing canvas link to go to AppEngine quickstart instead of console Project Create
Merge pull request #15 from laurenheller/patch-1

Update Canvas link on /products/app-engine/
Update index.html

commenting out quicklinks on pricing calculator page
Update index.html

removed quicklinks, fixed html
Merge remote-tracking branch 'upstream/master'

Conflicts:
	solutions/hadoop/index.html