Merge branch 'master' of github.com:optimizely/marketing-website
Merge branch 'master' of github.com:optimizely/marketing-website
Merge branch 'master' of github.com:optimizely/marketing-website
Merge branch 'master' of github.com:optimizely/marketing-website
remove company info json file and sepshadow.png that is duplicated in assets folder
Merge pull request #168 from optimizely/dfoxpowell/json-to-yml

Dfoxpowell/json to yml