add django - pin files
Merge branch 'master' of https://github.com/karoon/django-pin

Conflicts:
	.gitignore
fix merge