Made the desktop media queries looks more like the pre-responsive style
Rebasing
Merge branch 'develop' of https://github.com/alex-heritier/aheritier into develop

Conflicts:
	scripts/scripts.min.js
Merge pull request #6 from alex-heritier/develop

Develop