updated a bunch

Signed-off-by: Michael <michael@falsebehavinganimals.com>
Merge branch 'master' of https://github.com/MichaelFBA/LouisCo

Signed-off-by: Michael <michael@falsebehavinganimals.com>

Conflicts:
	wp-content/themes/louisandco/css/site.css
	wp-content/themes/louisandco/js/site.js