Media Queries

Mobile
Merge branch 'master' of https://github.com/lucasdelrio/g01

Conflicts:
	assets/sass/style.scss