d
Merge branch 'develop' of https://github.com/Ceng310/Web-Project into develop

Conflicts:
	connectDatabase.php