Code refactor
Merge branch 'responsive'

Conflicts:
	sass/screen.sass