f
Merge branch 'master' of github.com:salazarm/CaptchaCaptcher

Conflicts:
	authBack/authBack/settings.pyc
	authBack/facebook/__init__.pyc
	authBack/facebook/models.pyc