Update CHANGELOG.md
development backup, traversal attempt running, highlighting broken
Merge branch 'master' of https://github.com/Mbarrowclift/JFinder

Conflicts:
	CHANGELOG.md
Getting dev branch up to speed
.gitignore working again
Merge remote-tracking branch 'origin/master' into marc-dev