- minor fix
.gitignore
Merge branch 'newsetupmerge' of github.com:openpeer/op-identity-provider-server-php into newsetupmerge

Conflicts:
	.gitignore
	server/var/www/idprovider.com/public/js/HF.js