Use JSON as data holder for companies
Dynamically load company data from json file
Merge branch 'master' into gh-pages