update
edit .gitignore
before merge

before merge
Merge branch 'master' of https://github.com/assuming/knows into assuming-master
add stackcrawl,edit kr cnbeta
edit pipelines(add date hash url), item, spiders
merge
Merge branch 'master' of https://github.com/assuming/knows into assuming-master

Conflicts:
	knows/knows/items.py
	knows/knows/spiders/cnbetaSpider.py
Merge branch 'assuming-master'

Conflicts:
	knows/knows/spiders/cnbetaSpider.py
Merge pull request #2 from mtunique/master

updated