one
Merge branch 'test' of github.com:JulienPoncelet/test_rails_blog into test