fixed tablet media query and updated structure
Merge branch 'master' of github.com:catc/clean-scss-slate