Merge branch 'master' of github.com:WestWinds/Website

Conflicts:
	public/art.html