Gitignore
Merge branch 'master' of https://github.com/Goobs/odnareklama

Conflicts:
	ads/settings/local.py
Merge branch 'master' of https://github.com/Goobs/odnareklama