construccion
Merge branch 'master' of https://github.com/paulsutcliffe/lainonrails4

* 'master' of https://github.com/paulsutcliffe/lainonrails4:
  udpate