trying to ad file and commmitting it and later will resolve
Adding facebook signin initial stage
Merge branch 'master' of https://github.com/bhaveshthakker/gmr-site

Conflicts:
	scripts.php