Made a change
Merge branch 'testing'

Conflicts:
	NOTES
Merge branch 'master' of https://github.com/andrewtholt/ficl-5.1.0

Conflicts:
	NOTES
Back to normal