javascript button
.
Merge remote-tracking branch 'origin/master'

Conflicts:
	submit.html
	time.html