nandu
Merge branch 'master' of https://github.com/Nandakumar1989/testing

Conflicts:
	test.html
	testmysql.php
committing