made changes
Merge branch 'master' of https://github.com/surojmaharjan/newGitTest

Conflicts:
	1.php