sad
Merge branch 'master' of https://github.com/mohdshanil/ubututest.git

Conflicts:
	jam/newfile.php