Merge branch 'beta'
Merge branch 'beta' of https://github.com/leonardoaranda/dev-training-rails into beta
Merge branch 'master' of https://github.com/leonardoaranda/dev-training-rails into beta
readme
Merge pull request #7 from leonardoaranda/beta

readme