More responsive stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	2015/css/main.css
	2015/scss/main.scss