nothing important (i hope)
Merge branch 'master' of https://github.com/bgheneti/PythonPictoscrape

Conflicts:
	Django_Pictoscrape/db.sqlite3
	Django_Pictoscrape/fanfics/scraper.pyc
	Django_Pictoscrape/fanfics/views.pyc