Created intermediary media query
Merge branch 'master' of https://github.com/col-d/thefoxwebsite

Conflicts:
	css/main.css
	js/behaviours.js
Did some formatting