..
Merge branch 'master' of https://github.com/dangjlin/web_fetch

Conflicts:
	app/models/article.rb
..
 generate json file