modified:   script.js
	modified:   script.v0.1.js
	renamed:    script.v0.4.checkCollision.1st.js -> script.v0.4.1.collision.failed.js
	renamed:    script.v0.4.checkCollision.2nd.js -> script.v0.4.2.collision.flawed.js
	renamed:    script.v0.4.checkCollision.3rd.js -> script.v0.4.3.collision.good.js
	new file:   script.v0.4.4.collision.js
	modified:   script.js
Merge branch 'slave'

Conflicts:
	script.js

	modified:   script.js
Merge branch 'slave'