update 15/14
Merge branch 'vendida' of https://github.com/BowlMinions/bowl_site into vendida