Finished String Explorer work
Merge branch 'master' of http://github.com/BPHS/Magpie

Don't know why I'm pulling this because I'm editing my own file