update after mess-up
Merge branch 'master' of https://github.com/ashriths/campus-connect

Conflicts:
	php/function.php