This is from tanujb.com
Merge branch 'master' of https://github.com/gpranav88/fbpic

Conflicts:
	fbpic/settings.py