merging homepages
Merge branch 'master' of https://github.com/CaseyBailey/CollectivoApp