File location change from app to Rails.root
Merge branch 'Zavala'
Merge branch 'master' of https://github.com/baicunko/TallerIntegracion3