update
Merge branch 'master' of https://github.com/lichtgeist/art336-demo-03-samii

Conflicts:
	css/main.css
	index.html
	js/main.min.js
start