Made changes to company
Merge origin/master
Made changes to company and stock exchange