ADULT
ponies
Merge branch 'master' of https://github.com/bgheneti/PythonPictoscrape

Conflicts:
	Django_Pictoscrape/fanfics/templates/fanfics/detail.html