Line2 by Moin
Merge branch 'master' of https://github.com/kmshaik/test

Conflicts:
	hello.php