bootstrap merge
Merge https://github.com/borget/six-manantiales-mobile-promos