old changes
Merge branch 'master' of https://github.com/blunghino/GS_tools

Conflicts:
	gsfile.py