localchanges
Merge branch 'master' of https://github.com/nvanilkumar/login

Conflicts:
	index.php