Hamid

profile and edited home page ...
Merge remote-tracking branch 'origin/master'

Conflicts:
	profile.php