made a change
made other changes.
created test branch, with test.js
test.js: use strict, console.log
test.js: console.log only.
Merge branch 'testing'

Conflicts:
	test.js
concluded branch test