ahí va lo mío
Merge branch 'master' of https://github.com/InfoJobs/git

Conflicts:
	styles/carrousel.css
	styles/heading.css
	styles/media-board.scss
Merge branch 'master' of https://github.com/InfoJobs/git

Conflicts:
	styles/carrousel.css
Merge branch 'master' of https://github.com/InfoJobs/git

Conflicts:
	styles/carrousel.css
	styles/heading.css