disabling skrollr on mobile and touch devices #8
Merge branch 'master' into #8-disable-skrollr-on-mobile

Conflicts:
	assets/assets.map
	assets/stylesheets/main.min.css
Merge branch 'master' into #8-disable-skrollr-on-mobile

Conflicts:
	assets/assets.map
	assets/stylesheets/main.min.css
Merge branch 'master' into #8-disable-skrollr-on-mobile

Conflicts:
	assets/assets.map
	assets/stylesheets/main.min.css
added modernizer #8
Merge pull request #10 from stateshifters/#8-disable-skrollr-on-mobile

#8 disable skrollr on mobile