git ignore
Merge branch 'master' of https://github.com/pavelk2/social-feed

Conflicts:
	social-feed/php/settings.php