Fix cap import:articles tasks
Merge branch 'master' of github.com:elm-city-craftworks/practicing-ruby-web into explore
Merge branch 'explore' of github.com:elm-city-craftworks/practicing-ruby-web into explore
Update text
Merge branch 'explore' of github.com:elm-city-craftworks/practicing-ruby-web into explore
Merge branch 'explore' of github.com:elm-city-craftworks/practicing-ruby-web into explore
Resolve conflicts