Colin1
Merge branch 'master' of https://github.com/caulinez/FYP

Conflicts:
	WebSite1/App_Data/Database.mdf
	WebSite1/App_Data/Database_log.LDF
	WebSite1/public1.aspx
	WebSite1/student.aspx