hotfix
Merge branch 'hotfix-responsive-mixup'
Merge branch 'master' of https://github.com/16twenty/danielslloyd

Conflicts:
	assets/css/style.css
	assets/js/script.min.js