I really, really hate github. :)

Conflicts:
	pagemarker4.html
fixed the conflict
	htdox/crimespi.js