final
jkkkjk
Conflicts:
	application/controllers/facultyProjApp.php
	application/controllers/showProject.php
moon's and nikhil's changes added