Merge branch 'master' of https://github.com/RushanGajanayake/ACTA_Project
Merge branch 'master' of https://github.com/RushanGajanayake/ACTA_Project

Conflicts:
	.idea/workspace.xml
	view/admin_staff/course.html
	view/admin_staff/manage_details.html
	view/admin_staff/stu_check.php
	view/admin_staff/student_reg.php