Update company
- Created a list of companies
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	assets/stylesheets/global.styl