cambios
Merge branch 'master' of https://github.com/hugomarin/Beckett-Simonon

Conflicts:
	assets/scss/_responsive.scss