editing some files
Merge branch 'master' of https://github.com/r2d32/GollumScript

Conflicts:
	Test/Test-Scanner.js