Merge branch 'gh-pages' of https://github.com/aalexandrov/stratosphere into rmetzger_preview

Conflicts:
	_config.yml
Merge branch 'gh-pages' of https://github.com/dimalabs/ozone into rmetzger_preview
fixed some typos
Merge remote-tracking branch 'origin/gh-pages' into rmetzger_preview

Conflicts:
	_config.yml
Merge branch 'demo' into rmetzger_preview