Updates to the descriptions of the companies
Merge branch 'master' into foo

Conflicts:
	index.html