Merge branch 'master' of https://github.com/gitesh-purbia/school-managment-system

Conflicts:
	config.php
sanjay
add files