sdf
ifdsach 'master' of https://github.com/prakhar1989/researchportal

Conflicts:
	application/controllers/showProject.php
	application/models/project_model.php
hkjh
Merge branch 'master' of https://github.com/prakhar1989/researchportal
Merge branch 'master' of https://github.com/prakhar1989/researchportal
fsad
fsdadMerge branch 'master' of https://github.com/prakhar1989/researchportal

Conflicts:
	application/controllers/Conf_completed.php