Awkwardly working around github's insistence that I recommit

Scott's changes copied and pasted into my commit.
Reconciled Conflicts

Conflicts:
	js.js