added line by deepika
Removed function
added lines
Aman
i have added a new comment
I have gotted content from server
Merge branch 'BETA'

Conflicts:
	index.php