Learn in the chapter7
Merge branch 'master' of github.com:73log/asagao_rails4

Conflicts:
	spec/models/article_spec.rb