add num
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Merge remote-tracking branch 'heroku/master'

Conflicts:
	app/views/articles/show.html.erb
Merge remote-tracking branch 'origin/master'