Merge branch 'master' into gh-pages

major changes from master:
- used a changed in CSS property, rather than the browser width to test the window state
- added touch event to mobile menu