article crawl other site'
Merge branch 'master' of github.com:StevenKo/novel_reader_server

Conflicts:
	app/views/articles/edit.html.erb
	lib/classes/crawler.rb
	lib/classes/novel_crawler.rb