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

Conflicts:
	CHANGELOG.md