adding as a template
Merge branch 'master' of https://github.com/BPHS/Magpie

Conflicts:
	StringExplorer.java