problema na lupa
updates
updates
Merge branch 'rails-4'