Merge branch 'big-changes'
fixed some media query break points
Merge branch 'master' of https://github.com/craigwfox/craigwfox-v4