Merge branch 'master' of https://github.com/profstein/deleteLater

Conflicts:
	blah.html
fixed merge conflict
really fixed now