fixed tablet media query
merged
testing
testing gh-pages