re-commiting all
Merge branch 'master' of github.com:lbernardelli/rails