retried upload
Merge branch 'master' of https://github.com/ncaraker117/art336-demo-03-master

Conflicts:
	css/main.css
	js/main.js
	js/main.min.js
	js/plugins.min.js
	scss/_layout.scss
	scss/_module.scss