Companies
Merge branch 'master' of https://github.com/smartnisarg23/campusproject

Conflicts:
	application/modules/companies/controllers/companies.php