now it works
Merge branch 'master' of https://github.com/woodbury/Musha

Conflicts:
	mushaSave.ser