Merge branch 'master' of github.com:hincupetru/rails