added files to .gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	djsocial/settings.py
some changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore