modified
Merge branch 'master' of https://github.com/darshanrp/Georges-list

Conflicts:
	welcome.php