updating everything
trying again
updated
Merge remote-tracking branch 'mark/master'

Conflicts:
	htdocs/index.html