On branch master, added le file
	modified:   hello_world.js
	new file:   sicp_ch1_code_takefour.scm
On branch master, hoppefully these will separate
	modified:   hello_world.js
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