x
Merge branch 'master' of https://github.com/mateifl/djsocial

Conflicts:
	.gitignore
First test