update
.
Merge branch 'master' of https://github.com/alextebbs/16x24

Conflicts:
	src/js/scripts.js
	src/sass/imports/utilities/_layout.scss