After Branching
Merge branch 'amit' into Saransh

Conflicts:
	index.php
Conflict is now resolved
Merge branch 'Saransh' into amit