minor changes, commit before branch

Conflicts:
	javascriptTest.html