unnecessary, but it will not work without it
Merge branch 'master' of https://github.com/jibonita/Friends-Websites

Conflicts:
	.gitignore