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

Conflicts:
	.DS_Store
	have.php
	index.php
	layout.php
k
Merge branch 'develop' of https://github.com/Ceng310/Web-Project into develop

Conflicts:
	.DS_Store
	Form.php
	have.php
	index.php
	layout.php
Merge branch 'develop' of https://github.com/Ceng310/Web-Project into develop

Conflicts:
	.DS_Store
	have2.php
	indexResponse.php
	need.php
	need2.php
	otherProfile.php
	signout.php
	userProfile.php
update