css fix
Merge branch 'master' into #8-disable-skrollr-on-mobile

Conflicts:
	assets/assets.map
	assets/stylesheets/main.min.css