add.php
add.php
Merge remote-tracking branch 'remotes/origin/Nitesh' into Nitesh

Conflicts:
	application/views/components/scholarships/add/add.php
Merge branch 'Kaustubh' into Nitesh

Conflicts:
	sqls/scholarships.sql
Merge remote-tracking branch 'remotes/origin/Nitesh' into Nitesh
add.php changes
Merge branch 'Nitesh' into Kaustubh