Company Commit
Company Routes
Merge remote-tracking branch 'origin/fn-Company-Controller-Model' into nc-categories

Conflicts:
	config/routes.rb