local changes
Merge branch 'master' of https://github.com/benbos67/clj-parse

Conflicts:
	src/clj_parse/core.clj