detail
detail
Merge branch 'master' of https://github.com/A-Maze/A-Pc

Conflicts:
	Crawlers/pccrawler/pccrawler/spiders/afuture.pyc
	Website/APc/log.log
	Website/APc/log.log.1
	Website/db.sqlite3