current content
copy edits
more copy edits
more more copy edits
fixed YAML erros
synced with master.
fix merge conflict.
Merge pull request #350 from optimizely/ctiutan/final-branch

current content