rails app setup
pull

Merge branch 'master' of https://github.com/javimbk/pachangas