commit
Merge branch 'master' of https://github.com/markhatch/SamuraiChamp

Conflicts:
	.gitignore
	SamuraiChamp.userprefs