responsive styles for tablet and desktop done
Merge branch 'master' into gh-pages