On branch dev, looking to see if this is all the commit text, not to
mention beginning to branch
	modified:   hello_world.js
On branch dev, le branch adds
	modified:   hello_world.js
Merge branch 'master' into dev

Conflicts:
	hello_world.js

On branch dev, trying, hopefully, to merge in the master where there was
a same-line merge conflict
	modified:   hello_world.js
On branch dev, with hopefully 2 file merge conflicts

	modified:   hello_world.js
	new file:   sicp_ch1_code_takefour.scm
Merge branch 'master' into dev

Conflicts:
	sicp_ch1_code_takefour.scm

On branch dev, just merged master after a single conflict
	modified:   hello_world.js
	modified:   sicp_ch1_code_takefour.scm
On branch dev, making first commit for a PR
	modified:   sicp_ch1_code_takefour.scm
On branch dev, 2 commits is prob fine for a pull request
	modified:   sicp_ch1_code_takefour.scm
Merge branch 'dev'

Conflicts:
	sicp_ch1_code_takefour.scm

On branch master, maybe am successfully merging into master?
	modified:   hello_world.js
	modified:   sicp_ch1_code_takefour.scm